Final tidying...
Changes made by Jonathan Winterbourn (jonwinterbourn@googlemail.com).