Indent 4 spaces and refactor vars.

Moved and combined vars to tops of functions.
Make serverNow into a function argument.