more cleanup
changed PEG combinators to use method chaining rather than obscure operator syntax