Refactor: Cleanup for pre-commit

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