Completed the recommeded changes from Kory and James.