Fixed syntax style.
Removed code related to piecewise linear functionality that will go in a separate PR