and made it even cleaner