Cleaning up some quotes etc.