Refactor Show class