A little more code clean up.