Tidy-up and making output look a bit more bearable