Just some code cleanup.