bcc refactoring