R3D Refactoring