Some minor refactoring to respect our coding style.
Some minor refactoring to respect our coding style.

mirams/opencor,Fairly/opencor,mirams/opencor,Fairly/opencor,mirams/opencor,mirams/opencor,mirams/opencor,Fairly/opencor,Fairly/opencor,Fairly/opencor