Improve input form helper