Small tidy ups