Reindent and comments
Reindent