Refactors OO rps