Couple of small refactorings to make reading the code easier.
Couple of small refactorings to make reading the code easier.

InternetThings/meteor-gateway,InternetThings/meteor-gateway,InternetThings/meteor-gateway