cleaned up design a little