Cleaner mapping of data to html table