HW20: Cleanup contact form