Code is now much cleaner.