refactored api call
modularized
Merge pull request #3 from jarofghosts/master

Modularizificationified