trimmed form.name and cleaned up file
Merge pull request #235 from igal-getrailo/jira-2568

Jira 2568