DISCL-235: Code review Friday refactorings

This is preliminary draft review
I am not sure how you would rather do this - let's discuss it offline!