Some more design cleanup