Reindent and cleanup.