Refactor Save Points