design cleanup
design cleanup