slight refactoring

--HG--
branch : hold-input