Mainly spacing cleanup.