Integer case, String case refactoring