Code cleanup
Added form validation
Removed extra phone field from checkout page