Final changes made for organization.