Updated comments, refined organization.