cleaned up indentations, whitespace, comments