Minor changes / took out commented-out code