Finished refactoring - all done