Type: refactor Change-Id: I2bad8d4e7b9d7868c949856d0bbabeccb6825273 Signed-off-by: Damjan Marion <damarion@cisco.com>