Made code cleaner.