Cleanup and reform of the contact form