(TK-3) Move default-context into let

Move the acquisition of the default server's context into a let
statement to increase readability