Add sample RequestListener / improve code readability