Refactor to remove extra code