Cleanup and label spacing change