Coming along, some refactoring in the class