Reformat code
Add math expression support