Refactor the thing again