refactor(bs3): misc