Code refactoring to load the input helper as soon as possible.
Small code move.
Cleanup.