Some code clean up.