[Issue #9] cleanup