Fix coding style part one