RADAR-235: minor code refactoring