Refactored

Refactored the Roles manager class a bit to help better abstract out some
of the logic.

[Ticket: #44]