refactoring setting points in elaboration