using metadata for items' context instead of data
cleaning up spaces