Coding style improvement