Clean-up and changing field scope to be more restrictive.