Nonfunctional code cleanup
Merge pull request #466 from ajs6f/CodeCleanup4Eva

Nonfunctional code cleanup