Cleaned up logging calls