cleaning

refactored a couple lines in the roll methods to be more readable