Made code a bit cleaner.