- some code cleanup.