Cleaned up code based on WebStorm code inspections.
Merge branch 'master' of https://github.com/Chevex/CodeTunnel