Finished parsing of basic data
Improved formatting