Make this a little cleaner.