Little tidy ups