Made the request properties a bit cleaner