FNA Code Style ./I* - R*

Flibitized for #147.  All the usual, and removed unnecessary parenthesis from commutative additions.