Cleaned metadata a bit