Cosmetic changes
Add HTTPS check