Streamlined the design