and some more cleaning up