code tidyups