Minor cleanup
Clean up comments