Idiomatic code and low hanging efficiency gains

Yep, looks like it turns out to be.