some cleanup
a little more cleaning