"Tell don't ask" cleanup