Tidied up classes with spelling fixes, removal of unused members and
unused imports