Add some comments, clean up output