Refactor indentation