formatting cleanup and indents for easier readability