Add form

Clean code