Just code cleanup, white space et al. No functional changes.

Just code cleanup, white space et al. No functional changes.