Tidy up
Prepare 2.0.0 release