a minute refactoring