Comments and cleanup
Comments