Even cleaner (#44, #9)