Cleaned up roles