Cleaned up request and response validation