BACKLOG-4302 : code cleanup in regard to code review