comment and line length clean up