Polishing...

Change-Id: I14c7645b43406faf5ecc0b289a942e5d249089eb
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>