simplified action compositions and refactored the service components