Cleanup code & optimize imports.
Merge pull request #191 from Micky2506/clean-codebase

Cleanup code & optimize imports