Some minor cosmetics