Refactors

refactors are love, refactors are life