Re-working index wrapper in bs3