The cleaner version