Refactor - Internalize function
Refactor - Display prompt + wait for input inlined