Codesniff cleanup for service class