[@Alias] the first one is alot cleaner so i'd say that.

By the way i've now updated the gyms so you can have a gander at the leaders Pokemon.