- Remove unused roleHelper
- Add some comments