ArnoldC refactoring