Refactoring after PR