Tidying up classes and examples.