Removed useless commented code and factor SNI constructor