Cleaning up  a bit