Tidying suggested by Mark