Make this cleaner.