(While) Code cleanup; removed commented-out code