Rubocop automatic fixes, plus a few manual tweaks