Tidying up from Sef's pull request