clean up line length, comments
more comments