a few of line length and style cleanups

per my comments on the PR