Added minor cosmetic fixes