A few suggestions

Mostly just some cleanup and idiomatic stuff.