misc cleanup/commenting