clarify code a little
cleanup
more cleanup