Address a few line length Rubocop issues