Small code clean up