Refactoring user form