refactoring: moving controller data into services