little refactoring on HoneyComb