Refactor it!