Format code

Just some clean up in order to be consistent with your CS.
But somewhere else, the `=` symbols were already aligned. I didn't change anything :-/. We have to decide what is the expected format.