Refactor, everything