Update analysis
Minor clean ups