fix to format, changes to analyzer