Reindent + delete junk stuff