A little more code style fixing