More code style2