Issue #7
cleaned up