Refactor Request Handling / Polish JSON response