Refactor it all!