Some R# refactoring