Adressed review comments

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>