FV w/diagonal normalizer + pep8 corrections