Improve identifier parser