Refactored to use CategoryService rather than class methods on Category