more cleaning up
cleanup
Added comments