Make watching cleaner
Refactored and simplified trading form validation