Replacing with generic parsers
Replacing with generic parsers
Replacing with generic parsers
Minor formatting fixes
Minor code standards updates