added Parser to package, small style changes