Completed parsing and fixed formatting issue