Tidyups for 1.0.0