Some minor cosmetics applied