add some coding style changes