Cleanup some rubocop issues