Renamed role variable. Code cleanup.