Style changes
Add SPSA support