give some classes some better names
refactor service class