Another code clean up.