AUT: Pulling Parameters out of the code into an object, refactoring.