Tidying some bits up