CONN-1375 Refactored from code review comments