Cleanup. Improved logger.