remove the else return false on functions