Some code clean up done.