Spacing and code cleanup.