Some final code clean up.