cleanup & modify