comments and remove extra assignment