removed redundant, tidied other classes