Codesniff cleanup for service class
Merge remote-tracking branch 'dstockto/cs_service'