some tidyups