A little bit of cleaning up