Format comments
Update comments