Some trivial refactoring.
Some trivial refactoring.

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