cleaning up
Merge https://github.com/cschandler/FileAnalyzer1