Clean up some line length readability issues