This change increases our line length, the code was more readable before.