Cleaned up Role
Cleaned up role spacing etc
cleaned up role and spacing