Remove code smell. Minor refactor.
Update project settings to Universal.