Tidy up for 0.0 release