Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Align the parameters of a method call if they span more than one line.