refactoring elaboration (waiting for eleaboration)