RIP refactoring