refactor for lint - database Service