* cleaned up logging