cleaned up service
refactor service