Added table output formatter - needs refactoring
Tidied up the console formatted output stuff