code cleanup, indents