Continue refactor
12 files changed