cleaning return conditional satement