Minor whitespace fixes
Add alternate optimization but disable it