Remove return before assignment