Tidied up reports some more