Refactoring and cleaning rchecking...

Nothing really interesting....