Refactoring changes
Tidy up of class