Refactor a touch.