A bit of coding style improvement