Let's do a little code cleanup.