[FIX] Less complexity in bs_tools/bisar