Refactoring around bwlimitter