some tidyup