A little more cleaning up