Fix up some rubocop issues