Improve role management
Cleanup
Refactor

Use Secure annotation to save lines