Yes.
I moved everything on a single line.