Made a lot of changes to the output to make it cleaner.