refactored uppercase class