Refactoring for PR #160