Looks a lot cleaner (line 44)