Reindent (without accidental WIP this time)