A bit (much) cleaner.