Minor cleanup and comments