refactor. Split class apart
3 files changed