Refactoring after CR #1