Added better table formatting