Ok, will do a separate commit in this PR, since quite a bit of Javascript in Whitehall is four space