comments+cleanup