Reformat of parse package