about to finish refactoring