removed minor redundancies