Tidy up to get rid of Sphinx errors