Refactor: Cleanup for pre-commit

Change-Id: Ic4626da2242f1944aacb174ee96c48b82298cdb5
Issue-ID: CIMAN-33
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
9 files changed