Merge branch 'tidying' into chris