Added comments, done highlighting.

Change-Id: I6dab97bc9d9903acc7e2e221ae30addde59e1459