Re-organize methods.
Improve parser class javadoc.