Issue #88 + cleanup