A little code clean up