Mobile devise regex, and a small clean up.