Format comments and make corrections