Code review fixes - FileHelper
Comments from code review, split measurement out into its own method in Analyzer