tidying up by Michael Natanael Soedarsono
_