BUILDS: YES
C#: Minor refactoring