A little cleaning up