Got rid of 'service leaked intent error'
Removed some unnecessary initializations
Merge pull request #85 from g-ortuno/small-improvements

Small improvements