refactoring rnet