A little Cleanup