rewrite service for readability