More comments and necessary organization.