Ugh, output looks a bit better now