Reindent and restyle