correct segue repetition
remove some unnecessary code