[UPDATE] Change some coding style