Minor
Add remove question, refactor ...