Refactors, sorry