Reindent after the last commit, while at it also add some spaces for