Fresh code cleanup and optimisations

- Changed logging concatenation
- Removed unused imports
- more...
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>