[FNA] FNA Code Style - Storage directory

A few `var` cleanups, a ton of whitespace and spacing fixes, plus new braces on a lot of one-line if statements.