refactoring for today