Slight re-factoring of Parser