Fix more code style as mentionned in PR comments