A few small suggestions

These will make most sense if you go through the code commit by commit. No huge changes here, just a few small suggestions.