formatation comments + better analysis