* Removed unused variable * Align usage of C# type keywords vs Universal type names. Now we use C# keywords all over.