General cleanup/commenting