Streamlined a bit