Minor formatting changes and refactored SourceFileComplexityParser