Code clean up. More comments.