Refactoring of indentation