Improve the coding style