Refactor: Moved repeated calls to variable...

I am beginning to see the pattern -- so nice