cleanup, Issue #23 closed