Streamlined the file