Cleanup last rubocop issues