Refactor: Cleanup for pre-commit

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