Syntax refactor to make parser a little more readable