Issue #181: Refactor based on feedback.