moment added and comment format fixed