comments formattings fixed