edited some minor redundadancies