Cleaned up trading form validation