SUP-13373: refactor after code review
SUP-13373: refactor after code review

kaltura/server,kaltura/server,DBezemer/server,DBezemer/server,DBezemer/server,kaltura/server,kaltura/server,DBezemer/server,DBezemer/server,DBezemer/server,kaltura/server,DBezemer/server,kaltura/server,DBezemer/server