Minor cleanup/commenting