rm of some comments and formatting

Change-Id: Ibf2423d95e79a4ef3ede725f7716b8c924be251e