More rubocop fixes, down to 14