improvement of the coding style