Much better clean-up from last PB.

Probably won't improve it until a worthy challenger arrives to best me.