refactoring to make analysis more consistent; fixed output format for immutable fields