Refactor few methods