cleaning up the design a bit more