Finish service refactor