+Better naming for main parser functions