Streamlined comments and removed unused code