final eidts and eliminating commented code