Update to make code cleaner.