Comments and format

Comments and format