refactoring: uppercase after non