little more cleaning up