last refactoring for today