cleaned up roles controller