Made this all a bit cleaner.