2013.07.08 refactor the parsing part

refactor the parsing part