code cleanup
Merge branch 'fpfma_clean' of https://github.com/gilani/fpfma into fpfma_clean