Some minor cleanup/tuning/commenting