Refactor to smell good