Add more documentation to Parser

Also run full cleanup