Remove internal comments and did some clean up