Cleaned up logging again