Class refactored
Class refactored