remove old out-commented code and rename a variable