SIT-1347 slight refactor after review