refactoring minor: indentation and comments