Small code style related fixes