Refactored and updated a class file