restructure and rename buildExpr

Addresses #231