Code refactor and optimization#10

Baldomo wants to merge 1 commit intomark2b:mastermark2b/wpa-connect:masterfrom

Baldomo:masterBaldomo/wpa-connect:masterCopy head branch name to clipboard