Cleanup design. Issue #30