Format code

Just some clean up in order to be consistent with your CS.
Please, do not align `=` : it's a pain to keep clean. We always have to realign making the diffs unclear.