going on refactoring