A little bit cleaner now