service: Tidy-up