Replace local functions with existing modules
Remove old comment no longer applicable
Merge pull request #13 from gregturn/modularize-mobile

Replace local functions with existing modules
Hacking