Fix issue #63. Code cleanup.