I changed an 'if' clause to use a regex to check a MAC format.
Fixed a bug introduced with the regex.
I replaced a compound condition with a regex and switched an
elif with an else to improve effiency.
I replaced and elif with another regex.
Removed a blank line.
Removed whitespace and comments that are no longer needed.
Merge branch 'refactor' into develop