comments and clean_up