Issue #141: Refactoring