Re-factor (OSCAR.cs)