minor cosmetic changes to form