More line length clean up