More tidying up. This should have been committed last time :(