better presentation of forms and refactoring