cleaning up (issue #66)