Add trading form, clean the code