Method, some methods were refactored