cleaning up the design just a bit