design cleanup
more design cleanup