Get ready for version 7 for eProtect
Clean up spacing and formating