Adding logger
Cleanup