Cleanup for legibility