Thinking back this feels like an overdue change.

Most importantly still has the error and feels like it'll make it easier to look at.