Small tidy up