[IC] internal cleanup of comments and code formatting