A little code cleanup, more to come.