Much cleaner organization.