REFACTORING: code re-indent