Clr refactoring