Made the code cleaner.