Finished refactors