Clean up design a lot