More comments, renames for clarity.