Reverted named functions to variable assignments

Apparently, that's a no-no in strict mode...
Fixed some more whitespace while I was at it.