Minor cosmetic updates to code