Unnecessary classes removed, switched to maps and lists
Merge branch 'master' of github.com:DiKeert/xpath-view