Refactoring by removing FormInput from user manipulations