Refactoring class_eval removal and also removing instance_eval