Minor cleanup

A little more idiomatic, cleaning up as I learn things.