Cleanup and proper Logging