minor cosmetic fixes and standardizations