bcm283* refactoring continues