Streamlined code