did some more cleaning up