Some indenting refactoring