Set Mac Address & Refactoring