code clean up.