documented map, removed unnecessery parsing code
overall small code improvements, readability
Merge pull request #8 from dvicini/master

Some overall code improvements, readability