Refactoring...
Merge pull request #604 from pmiossec/refactoring_rcheckin

Refactoring and cleaning rchecking...