Metadata style cleanup

Better alignment with Apple framework standard.