start refactoring things