Refactor Contact section

Clean up another ~100 lines of code! : D