Comments and names adjustment