Reindent and comment some stuff