Minor syntax cleanups
Merge branch 'master' of github.com:Gordonei/ForwardFinancialFramework