cleanup
design feedback