REFACTOR ALL THINGS!!!