Adding ability to change the SSID and refactoring