Implemented Dictionary of Elements in Parser

And some minor cleaning.