Moved table formatting