refactored methods and class name