Code cleanup(issue #47).