Mention who is going to switch back and forth.

Also (auto)cleaned whitespace.