Bandwidth refactoring