Refactor Show Handler

Trello card: https://trello.com/c/D8ikFRpj/22-refactor-show-handler