Streamline design a bit