Jin Goundry - Implementation of recommended contract revisions

Implementation of recommended contract revisions