finished refactoring for tonight