BLK-161 Code Review changes

Signed-off-by: Oren Leiman <oleiman@neutral.io>