Soem code cleanup.