A little code refactor, add service.yml