Cleaned up Request class