Could have been a little cleaner