Cleanup of display and name