Refactoring after CR #2