Simplify and Improve readability on some conditions
Merge pull request #1 from scudelletti/self-hosted_server

Simplify and Improve readability on some conditions