Simplified service code.  Removed useless return with reference to this.