fix Bug with eInput
Format code
refactor