Refactor show