Refactoring in preparation for methods handling