[TASK] Refactoring of common methods