some cleanup/commenting