DISCL-235: Code review Friday refactorings

This is preliminary draft review
Short answer: yes. Although this open complex design questions as to what class depends on what other class. I am considering how I could improve this further.