Refactoring as of Thursday afternoon