Refactor Code#

Not needed for CS 430.

Backward Pair Program Code Review Forward