Bango refactor