Issue #9: Refactoring