Refactored show method. gh-16