Cleanup
edited comment