logging cleaned up