Streamlined some stuff