Cleanup
Moved logging to the logging module