More table formatting tweaks and a little tidy up