Cleanups
Code cleanup, Parser function renaming and additional documentation