Refactoring of Fermi validation code.