Refactor: Cleanup for pre-commit

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