Polish

Minor improvements