improvement

not global improvement
just class Parser