[OUG] Some code clean up.