Refactor for issue #1.

Resolve issue #1.