Renamed a few classes, removed some unused code, and just general cleanup of ExpressionParser
More clean up of how filters and arguments are parsed