rework and cleanup
Merge pull request #1 from AmericanRedCross/dan-working

rework and cleanup
cleaning up comments
Merge pull request #2 from AmericanRedCross/dan-working

cleaning up comments