Small tidyup