fix commen & remove a couple of unused assignments