Also clean up comments and minor formatting fixes Change-Id: Ic6880ae4ca654b0b21f47f820770bd927f27e99b