Issue #1 cleanup