Some code clean up.
A bit more clean up.