Refactorying indentation