modified coding style