Refactoring according to CR