Cleaning up design a bit