Refactoring & renaming; improving sanity of field organization.