A little bit of Clean up