Tidied up the class a little