Fix review findings

Change-Id: Iab58f5f5bca09c89627a4bedabf51409a66103b6
Signed-off-by: Marc Koderer <m.koderer@telekom.de>