Code clean up, no functionality change.