Parsing and saving more data, and shortening source code lines