Cleanup (legibility)