Streamlined code for better zen