More refactoring. EOM