More Cleanup of Spacing