Refactors everywhere!