Issue #10 cleanup and comment