Did some code cleanup.