improvements

Signed-off-by: Yaniv Bronhaim <ybronhei@redhat.com>