A little bit of cleanup and addition.