Class-Race limitations + Refactoring