a few more style nits I had laying around