Refactor: Cleanup for pre-commit

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