Add expression tree functionality, clean up tabs and spaces

Incorporate expression tree functionality