Minor changes in code
Better formatting of metadata info