- comments cleanup and nonfunctional changes