Performance improvement commits

Performance improvement commits https://github.com/Mvied/wordpress-https/issues/16