Made it a bit cleaner.