Fixes based on feedback

* moved List() in services package
* added comments to public types
* moved regex outside of function