Some tidyup