Added data tag to output format and fixed some spacing issues