Minor cleanup

Minor cleanup