Post code-review, extended refactor.