http => https
Remove commented code, fix formatting