fix indentation and conforms to style guide