SLT-614 Post-code review refactor