IMO the original was much more readable.