cleanup comments etc
cleanup
behavior is just right