Refactored statements to use methods instead of instance variables and dependency injection of the class for building a Statement.
Refactored statements to use methods instead of instance variables and
dependency injection of the class for building a Statement.

drueck/giving,drueck/giving