Code clean up, no functionality changes.