Cleanup of properties & names.