Just did some code cleanup.