Some additional tidying