fix some formatting
rework expression parser class