refactored code a little
Merge pull request #6 from CalvinFernandez/mobile-tweaks

refactored code a little