Refactor on Treatment save