FNA Code Style Cleanup