A little cleaner :)