IMHO the original version was more easy to read.