clean up design a bit