cleaning/commenting