Fix Rubocop complains (mostly)