cleanded some comments