comments and cleaned up indents