Some code style fixing