small refactoring of services and activities using services