Refactor defaultReturnHandler
Merge pull request #124 from tarrsalah/return_handler/refactoring

Refactor defaultReturnHandler