Cleaned up methods
Merge pull request #2 from ryanprogramthings/master

Cleaned up methods