More tidyups