Match latest coding style from my framework