Add some output and make code more readable.