cleanup + log_name added