code improvements
code enhancement
Merge pull request #3 from hasith/master

Some code improvements and improved variable naming in dataservice.js