Refactor

hmm, indeed