Small code cleanup for Bob's changes