Idiomatic code and low hanging efficiency gains

And here.