Small amount of code cleanup.