some more cleaning up code