removed extra returns