Removes some unused imports and more light formatting improvements

Signed-off-by: Oren Leiman <oleiman@neutral.io>