fix code review remarks
fix code review remarks

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