refactor eos analyzers