Minor, code clean up