Minor refactoring/reroll to reflect new traits