Revisions per titanous

* changed the signature of Next() to (Service, error)
* minor style fixes