Improved Output Format

Changed the format of the output, so it is hopefully much better
readable