cleaned some commented code