Camp: Refactored contact us code