#23 Cleaned up logging