Performance improvements

This line could be more readable by adding a line-break for each new key-value-pair. :)