Minor cleanup and improve comments