cleaned things up
more cleaning