Garbage removed, formatting improved