legibility and cleanup