Cleaned up contact section