Cosmetic Changes

Some minor cosmetic changes.