Fixed it, but I have mixed feelings, IMO it is less readable.