More minor cosmetic changes