reindent, remove and some stuff