Correction for ee85799
Formatted code in preparation for refactoring