Tidied up role listing