removed unnessecary else logic