Refactoring user form fileds to prevent conflicts between scalar fields and compound fields
Code cleaning up