Updated comments and organization.