Small bits of cleanup from personal review