removed unused analysis
renaming analysis methods
reordered analysis methods