Another refactor
Continuing refactor