Bit more code tidying
Code tidying and defaulting to empty strings for table format