Slightly better organization.