code cleanup, indents, comments