Resolved jslint issues
Moved content parsing into service