Cosmetic fixes to contact us form + cleaned up some code snippets